diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework')
86 files changed, 251 insertions, 237 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java index 5195570c5f5..780d16b41a5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java @@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Conditions; @@ -346,7 +346,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { public IStatus runInUIThread(IProgressMonitor monitor) { IStatus status = Status.OK_STATUS; try { - IOseeBranch branch = branchProvider.getBranch(monitor); + BranchId branch = branchProvider.getBranch(monitor); if (branch == null) { status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Branch not selected"); } else { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java index e7ed4e7a42a..5e5a6bac685 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java @@ -18,7 +18,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -189,7 +189,7 @@ public class ArtifactDragDropSupport { public static Artifact getArtifactFromWorkspaceFile(String location, Shell shell) throws OseeCoreException { Artifact artifact = null; - IOseeBranch branch = BranchSelectionDialog.getBranchFromUser(); + BranchId branch = BranchSelectionDialog.getBranchFromUser(); if (branch != null) { try { artifact = ArtifactQuery.getArtifactFromAttribute(CoreAttributeTypes.ContentUrl, location, branch); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java index 33e9c739e3e..b947e5486f8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.artifact; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.jdk.core.type.HashCollection; @@ -42,8 +42,8 @@ public class MassEditDirtyArtifactOperation extends AbstractOperation implements AWorkbench.popup("No Dirty Artifacts Found"); return; } - HashCollection<IOseeBranch, Artifact> branchMap = Artifacts.getBranchArtifactMap(artifacts); - for (IOseeBranch branch : branchMap.keySet()) { + HashCollection<BranchId, Artifact> branchMap = Artifacts.getBranchArtifactMap(artifacts); + for (BranchId branch : branchMap.keySet()) { MassArtifactEditor.editArtifacts(String.format("Dirty Artifacts for Branch [%s]", branch), branchMap.getValues(branch)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java index 94ea8c8d600..e994f9d240b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java @@ -17,7 +17,7 @@ import java.util.Map.Entry; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.OperationLogger; @@ -99,7 +99,7 @@ public class AttributeCheckOperation extends AbstractOperation { @SuppressWarnings("unchecked") private void compareAllChildrenWithPopularValue(List<Artifact> allDescendants, String popularValue, Artifact folder, IProgressMonitor monitor) throws OseeCoreException { if (!allDescendants.isEmpty()) { - IOseeBranch tempBranch = allDescendants.get(0).getBranch(); + BranchId tempBranch = allDescendants.get(0).getBranch(); Branch branch = BranchManager.getBranch(tempBranch); SkynetTransaction transaction = TransactionManager.createTransaction(branch, "Attribute Check Blam"); if (!branch.getBranchType().isWorkingBranch()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteMultipleAttributesBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteMultipleAttributesBlam.java index cdcfb23755d..348a9b19ade 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteMultipleAttributesBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteMultipleAttributesBlam.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -60,7 +60,7 @@ public class DeleteMultipleAttributesBlam extends AbstractBlam { @Override public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception { boolean keepOldest = "Oldest".equals(variableMap.getRadioSelection(ATTRIBUTE_TO_KEEP)); - IOseeBranch branch = variableMap.getBranch(SELECT_BRANCH_LABEL); + BranchId branch = variableMap.getBranch(SELECT_BRANCH_LABEL); if (branch == null) { log("ERROR: A branch must be selected!"); return; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java index 8ceb83ef417..0de045d3828 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; @@ -66,7 +66,7 @@ public class RelationOrderRepairBlam extends AbstractBlam { return; } recurse = variableMap.getBoolean("Recurse Over Hierarchy"); - IOseeBranch branch = getBranch(inputArtifacts); + BranchId branch = getBranch(inputArtifacts); transaction = TransactionManager.createTransaction(branch, getName()); for (Artifact art : inputArtifacts) { resetRelationOrder(art); @@ -74,7 +74,7 @@ public class RelationOrderRepairBlam extends AbstractBlam { transaction.execute(); } - private IOseeBranch getBranch(List<Artifact> arts) throws OseeArgumentException { + private BranchId getBranch(List<Artifact> arts) throws OseeArgumentException { Artifact firstArt = arts.get(0); for (Artifact art : arts) { if (!firstArt.isOnSameBranch(art)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java index a92542a7936..57bd2342375 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.client.ClientSessionManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.operation.AbstractOperation; @@ -54,7 +54,7 @@ public class ReplaceArtifactWithBaselineOperation extends AbstractOperation { TransactionEndpoint txBuilder = client.getTransactionEndpoint(); Artifact firstArtifact = artifacts.iterator().next(); TransactionRecord txRecord = firstArtifact.getFullBranch().getBaseTransaction(); - IOseeBranch branch = firstArtifact.getBranch(); + BranchId branch = firstArtifact.getBranch(); for (Artifact artifact : artifacts) { monitor.subTask("Reverting: " + artifact.getName()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java index a14f283d134..0eeee1ff84e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.GUID; @@ -34,7 +34,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.IXWidgetInputAddable; public class StringGuidsToArtifactListOperation extends AbstractOperation { private final String rawGuidsData; - private final IOseeBranch branch; + private final BranchId branch; private final IXWidgetInputAddable widget; public final static String splitRegex = "\\s+"; @@ -47,7 +47,7 @@ public class StringGuidsToArtifactListOperation extends AbstractOperation { * @param branch on which the artifacts live on * @param widget accepting input by implementing <code>IXWidgetInputAddable</code> interface */ - public StringGuidsToArtifactListOperation(OperationLogger logger, String guidData, IOseeBranch branch, IXWidgetInputAddable widget) { + public StringGuidsToArtifactListOperation(OperationLogger logger, String guidData, BranchId branch, IXWidgetInputAddable widget) { super(taskName, Activator.PLUGIN_ID, logger); this.rawGuidsData = guidData; this.branch = branch; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java index ed38d7acb48..92f451fc5c9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java @@ -18,6 +18,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.nebula.widgets.xviewer.XViewer; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -48,18 +49,18 @@ import org.eclipse.swt.widgets.TreeItem; public class BranchSelectionDialog extends MessageDialog implements IBranchWidgetMenuListener { private IOseeBranch selected; - private IOseeBranch defaultSelected; - private static IOseeBranch lastSelectedBranch; + private BranchId defaultSelected; + private static BranchId lastSelectedBranch; private XBranchWidget branchWidget; private boolean allowOnlyWorkingBranches; - private final Collection<? extends IOseeBranch> branches; + private final Collection<? extends BranchId> branches; public BranchSelectionDialog(String title, boolean allowOnlyWorkingBranches) { this(title, null); this.allowOnlyWorkingBranches = allowOnlyWorkingBranches; } - public BranchSelectionDialog(String title, Collection<? extends IOseeBranch> branches) { + public BranchSelectionDialog(String title, Collection<? extends BranchId> branches) { super(Displays.getActiveShell(), title, null, null, MessageDialog.NONE, new String[] {"Ok", "Cancel"}, 0); allowOnlyWorkingBranches = false; selected = null; @@ -67,7 +68,7 @@ public class BranchSelectionDialog extends MessageDialog implements IBranchWidge setShellStyle(getShellStyle() | SWT.RESIZE); } - public void setDefaultSelection(IOseeBranch branch) { + public void setDefaultSelection(BranchId branch) { defaultSelected = branch; } @@ -85,7 +86,7 @@ public class BranchSelectionDialog extends MessageDialog implements IBranchWidge branchWidget.addBranchSelectedListener(new BranchSelectedListener() { @Override - public void onBranchSelected(IOseeBranch branch) { + public void onBranchSelected(BranchId branch) { getButton(IDialogConstants.OK_ID).setEnabled(true); storeSelectedBranch(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java index 7c88dd2e788..a37359b1e57 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.change; import java.util.logging.Level; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; @@ -28,7 +28,7 @@ import org.eclipse.ui.IPersistableElement; public class ChangeReportEditorInput implements IEditorInput, IPersistableElement { private final ChangeUiData changeData; - private IOseeBranch branch; + private BranchId branch; private boolean transactionTabActive = false; private boolean notLoaded = false; @@ -36,7 +36,7 @@ public class ChangeReportEditorInput implements IEditorInput, IPersistableElemen this(changeData, null); } - public ChangeReportEditorInput(ChangeUiData changeData, IOseeBranch branch) { + public ChangeReportEditorInput(ChangeUiData changeData, BranchId branch) { this.changeData = changeData; this.branch = branch; } @@ -122,7 +122,7 @@ public class ChangeReportEditorInput implements IEditorInput, IPersistableElemen ChangeReportEditorInputFactory.saveState(memento, this); } - public IOseeBranch getBranch() { + public BranchId getBranch() { return branch; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java index e63a473d82b..7dd2fe0daf4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionDelta; @@ -33,11 +33,11 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.progress.UIJob; public final class ChangeUiUtil { - public static void open(IOseeBranch branch) throws OseeCoreException { + public static void open(BranchId branch) throws OseeCoreException { open(branch, false); } - public static void open(IOseeBranch branch, boolean showTransactionTab) throws OseeCoreException { + public static void open(BranchId branch, boolean showTransactionTab) throws OseeCoreException { Branch heavyBranch = BranchManager.getBranch(branch); Conditions.checkNotNull(branch, "Branch"); if (heavyBranch.getBranchType() == BranchType.BASELINE) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java index a0f5499a643..2c4ec6f618b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.plugin.core.util.Jobs; @@ -36,14 +37,14 @@ public final class UiOtherBranchDialogProvider implements IBranchProvider { @Override public IOseeBranch getBranch(IProgressMonitor monitor) throws OseeCoreException { final IOseeBranch[] selectedBranch = new IOseeBranch[1]; - final Collection<? extends IOseeBranch> selectable = BranchManager.getBaselineBranches(); + final Collection<? extends BranchId> selectable = BranchManager.getBaselineBranches(); selectable.remove(uiData.getTxDelta().getStartTx().getBranch()); IStatus status = executeInUiThread(selectable, selectedBranch); monitor.setCanceled(status.getSeverity() == IStatus.CANCEL); return selectedBranch[0]; } - private IStatus executeInUiThread(final Collection<? extends IOseeBranch> selectable, final IOseeBranch[] selectedBranch) throws OseeCoreException { + private IStatus executeInUiThread(final Collection<? extends BranchId> selectable, final BranchId[] selectedBranch) throws OseeCoreException { IStatus status = null; Display display = AWorkbench.getDisplay(); if (display.getThread().equals(Thread.currentThread())) { @@ -65,7 +66,7 @@ public final class UiOtherBranchDialogProvider implements IBranchProvider { return status; } - private IStatus getUserSelection(Collection<? extends IOseeBranch> selectable, IOseeBranch[] selectedBranch) { + private IStatus getUserSelection(Collection<? extends BranchId> selectable, BranchId[] selectedBranch) { IStatus status = Status.OK_STATUS; BranchSelectionDialog dialog = new BranchSelectionDialog("Select branch to compare against", selectable); int result = dialog.open(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java index 875e4cd0f7f..1517e82dcc2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -42,7 +43,7 @@ public final class UiSelectBetweenDeltasBranchProvider implements IBranchProvide if (txDelta.areOnTheSameBranch()) { selectedBranch[0] = txDelta.getStartTx().getFullBranch(); } else { - final Collection<IOseeBranch> selectable = new ArrayList<>(); + final Collection<BranchId> selectable = new ArrayList<>(); selectable.add(uiData.getTxDelta().getStartTx().getFullBranch()); selectable.add(uiData.getTxDelta().getEndTx().getFullBranch()); IStatus status = executeInUiThread(selectable, selectedBranch); @@ -51,7 +52,7 @@ public final class UiSelectBetweenDeltasBranchProvider implements IBranchProvide return selectedBranch[0]; } - private IStatus executeInUiThread(final Collection<IOseeBranch> selectable, final IOseeBranch[] selectedBranch) throws OseeCoreException { + private IStatus executeInUiThread(final Collection<BranchId> selectable, final BranchId[] selectedBranch) throws OseeCoreException { IStatus status = null; Display display = AWorkbench.getDisplay(); if (display.getThread().equals(Thread.currentThread())) { @@ -73,7 +74,7 @@ public final class UiSelectBetweenDeltasBranchProvider implements IBranchProvide return status; } - private IStatus getUserSelection(Collection<IOseeBranch> selectable, IOseeBranch[] selectedBranch) { + private IStatus getUserSelection(Collection<BranchId> selectable, BranchId[] selectedBranch) { IStatus status = Status.OK_STATUS; BranchSelectionDialog dialog = new BranchSelectionDialog("Select branch to compare against", selectable); int result = dialog.open(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowChangeReportSinceAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowChangeReportSinceAction.java index 476d6fb0d35..256eae92729 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowChangeReportSinceAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowChangeReportSinceAction.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -30,9 +30,9 @@ import org.eclipse.osee.framework.ui.swt.ImageManager; public class ShowChangeReportSinceAction extends Action { private final ITransactionRecordSelectionProvider selectionProvider; - private final IOseeBranch branch; + private final BranchId branch; - public ShowChangeReportSinceAction(IOseeBranch branch, ITransactionRecordSelectionProvider selectionProvider) { + public ShowChangeReportSinceAction(BranchId branch, ITransactionRecordSelectionProvider selectionProvider) { super("Show Change Report Since"); this.branch = branch; this.selectionProvider = selectionProvider; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java index 81e486a15db..546e5a4a399 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.change.operations; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -38,7 +38,7 @@ public class LoadCompareBranchToBranch extends AbstractOperation { @Override protected void doWork(IProgressMonitor monitor) throws Exception { Branch startBranch = uiData.getTxDelta().getStartTx().getFullBranch(); - IOseeBranch otherBranch = branchProvider.getBranch(monitor); + BranchId otherBranch = branchProvider.getBranch(monitor); checkForCancelledStatus(monitor); Conditions.checkNotNull(otherBranch, "other branch to compare to"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java index c1a1b9a63b6..3bde7e2052b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java @@ -39,7 +39,7 @@ public final class BaseToHeadHandler implements IChangeReportUiHandler { public String getName(TransactionDelta txDelta) { String branchName; try { - branchName = txDelta.getEndTx().getBranch().getShortName(BRANCH_NAME_LEN); + branchName = txDelta.getEndTx().getBranchToken().getShortName(BRANCH_NAME_LEN); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; @@ -63,7 +63,7 @@ public final class BaseToHeadHandler implements IChangeReportUiHandler { NumberFormat formatter = NumberFormat.getInstance(); return String.format( "Shows all changes made to [<b>%s</b>] from when it was created (transaction <b>%s</b>) until it was last modified (transaction <b>%s</b>).", - AXml.textToXml(txDelta.getStartTx().getBranch().getName()), + AXml.textToXml(txDelta.getStartTx().getBranchToken().getName()), AXml.textToXml(formatter.format(txDelta.getStartTx().getId())), AXml.textToXml(formatter.format(txDelta.getEndTx().getId()))); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java index 0c3376518a1..41a2b60b5a9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java @@ -38,7 +38,7 @@ public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler public String getName(TransactionDelta txDelta) { String branchName; try { - branchName = txDelta.getStartTx().getBranch().getShortName(BRANCH_NAME_LEN); + branchName = txDelta.getStartTx().getBranchToken().getShortName(BRANCH_NAME_LEN); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; @@ -69,12 +69,12 @@ public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler if (changeUiData.isMergeBranchValid()) { data = String.format( "Shows all changes made to [<b>%s</b>], including changes found in the merge branch compared to branch [<b>%s</b>].", - AXml.textToXml(txDelta.getStartTx().getBranch().getName()), - AXml.textToXml(txDelta.getEndTx().getBranch().getName())); + AXml.textToXml(txDelta.getStartTx().getBranchToken().getName()), + AXml.textToXml(txDelta.getEndTx().getBranchToken().getName())); } else { data = String.format("Shows all changes made to [<b>%s</b>] compared to branch [<b>%s</b>].", - AXml.textToXml(txDelta.getStartTx().getBranch().getName()), - AXml.textToXml(txDelta.getEndTx().getBranch().getName())); + AXml.textToXml(txDelta.getStartTx().getBranchToken().getName()), + AXml.textToXml(txDelta.getEndTx().getBranchToken().getName())); } return data; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java index 3603bb350f6..5e89af74c55 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java @@ -38,7 +38,7 @@ public final class CurrentsAgainstParentHandler implements IChangeReportUiHandle public String getName(TransactionDelta txDelta) { String branchName; try { - branchName = txDelta.getStartTx().getBranch().getShortName(BRANCH_NAME_LEN); + branchName = txDelta.getStartTx().getBranchToken().getShortName(BRANCH_NAME_LEN); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; @@ -69,12 +69,12 @@ public final class CurrentsAgainstParentHandler implements IChangeReportUiHandle if (changeUiData.isMergeBranchValid()) { data = String.format( "Shows all changes made to [<b>%s</b>], including changes found in the merge branch compared to%s branch [<b>%s</b>].", - AXml.textToXml(txDelta.getStartTx().getBranch().getName()), " its parent", - AXml.textToXml(txDelta.getEndTx().getBranch().getName())); + AXml.textToXml(txDelta.getStartTx().getBranchToken().getName()), " its parent", + AXml.textToXml(txDelta.getEndTx().getBranchToken().getName())); } else { data = String.format("Shows all changes made to [<b>%s</b>] compared to%s branch [<b>%s</b>].", - AXml.textToXml(txDelta.getStartTx().getBranch().getName()), " its parent", - AXml.textToXml(txDelta.getEndTx().getBranch().getName())); + AXml.textToXml(txDelta.getStartTx().getBranchToken().getName()), " its parent", + AXml.textToXml(txDelta.getEndTx().getBranchToken().getName())); } return data; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java index b7a4f42d705..99c4dee3c5b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java @@ -39,7 +39,7 @@ public final class SpecificTxsHandler implements IChangeReportUiHandler { public String getName(TransactionDelta txDelta) { String branchName; try { - branchName = txDelta.getEndTx().getBranch().getShortName(BRANCH_NAME_LEN); + branchName = txDelta.getEndTx().getBranchToken().getShortName(BRANCH_NAME_LEN); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; @@ -68,7 +68,7 @@ public final class SpecificTxsHandler implements IChangeReportUiHandler { TransactionDelta txDelta = changeUiData.getTxDelta(); NumberFormat formatter = NumberFormat.getInstance(); return String.format("Shows changes made to [<b>%s</b>] between transactions [<b>%s</b>] and [<b>%s</b>].", - AXml.textToXml(txDelta.getStartTx().getBranch().getName()), + AXml.textToXml(txDelta.getStartTx().getBranchToken().getName()), AXml.textToXml(formatter.format(txDelta.getStartTx().getId())), AXml.textToXml(formatter.format(txDelta.getEndTx().getId()))); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java index 7646a3b4dbb..b4c978641b6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java @@ -24,7 +24,7 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.nebula.widgets.xviewer.XViewer; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.operation.OperationBuilder; import org.eclipse.osee.framework.core.operation.Operations; @@ -69,12 +69,12 @@ import org.eclipse.ui.progress.UIJob; public class BranchTransactionPage extends FormPage implements IBranchWidgetMenuListener, ITransactionEventListener, ITransactionRecordSelectionProvider { private XBranchWidget xBranchWidget; - private final IOseeBranch branch; + private final BranchId branch; private final AtomicBoolean refreshNeeded = new AtomicBoolean(false); private final AtomicBoolean processEvents = new AtomicBoolean(false); private BranchTransactionUiData branchTransactionData; - public BranchTransactionPage(ChangeReportEditor editor, IOseeBranch branch) { + public BranchTransactionPage(ChangeReportEditor editor, BranchId branch) { super(editor, "transaction", "Transactions"); this.branch = branch; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java index fb6be8c17df..5ddebad90d0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.change.view; import java.util.List; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -166,14 +166,14 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView @Override public void handleBranchEvent(Sender sender, final BranchEvent branchEvent) { ChangeUiData changeUiData = getEditorInput().getChangeData(); - IOseeBranch[] branches = new IOseeBranch[2]; + BranchId[] branches = new BranchId[2]; try { branches[0] = changeUiData.getTxDelta().getStartTx().getBranch(); branches[1] = changeUiData.getTxDelta().getEndTx().getBranch(); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, "Error obtaining change report branches for branch event", ex); } - for (IOseeBranch branch : branches) { + for (BranchId branch : branches) { if (branch != null && branch.equals(branchEvent.getSourceBranch())) { switch (branchEvent.getEventType()) { case Deleting: diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java index 73e7b709580..245fb0ca932 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.swt.KeyedImage; @@ -34,7 +34,7 @@ public interface IOseeCmService { boolean isCmAdmin(); - public IOseeBranch getCmBranchToken(); + public BranchId getCmBranchToken(); void openArtifact(Artifact artifact, OseeCmEditor oseeCmEditor); @@ -62,7 +62,7 @@ public interface IOseeCmService { IArtifactType getPcrTaskArtifactType(); - boolean isWorkFlowBranch(IOseeBranch branch); + boolean isWorkFlowBranch(BranchId branch); void commitBranch(Artifact art, Branch branch, boolean isArchiveSource); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java index 0ce613307a4..fbf1c278fad 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java @@ -14,7 +14,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -37,7 +37,7 @@ public class AccessControlHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); List<Artifact> artifacts = Handlers.getArtifactsFromStructuredSelection(structuredSelection); boolean hasArtifacts = artifacts.size() == 1; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/BranchTransactionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/BranchTransactionHandler.java index 6129687ece6..5099cf2b54e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/BranchTransactionHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/BranchTransactionHandler.java @@ -13,8 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; @@ -34,7 +33,7 @@ public class BranchTransactionHandler extends CommandHandler { if (selection.size() == 1) { Object selectedObject = selection.getFirstElement(); - if (selectedObject instanceof Branch) { + if (selectedObject instanceof BranchId) { enabled = true; } } else { @@ -50,7 +49,7 @@ public class BranchTransactionHandler extends CommandHandler { try { if (selection.size() == 1) { Object selectedObject = selection.getFirstElement(); - ChangeUiUtil.open((IOseeBranch) selectedObject, true); + ChangeUiUtil.open((BranchId) selectedObject, true); } } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java index 6f70a809c2e..200d8a3fb71 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLevel; @@ -37,7 +37,7 @@ public class ChangeReportHandler extends CommandHandler { if (selectedObject instanceof TransactionRecord) { enabled = ((TransactionRecord) selectedObject).getTxType() != TransactionDetailsType.Baselined; - } else if (selectedObject instanceof IOseeBranch) { + } else if (selectedObject instanceof BranchId) { enabled = true; } } else if (selection.size() == 2) { @@ -72,8 +72,8 @@ public class ChangeReportHandler extends CommandHandler { Object selectedObject = selection.getFirstElement(); if (selectedObject instanceof TransactionRecord) { ChangeUiUtil.open((TransactionRecord) selectedObject); - } else if (selectedObject instanceof IOseeBranch) { - ChangeUiUtil.open((IOseeBranch) selectedObject); + } else if (selectedObject instanceof BranchId) { + ChangeUiUtil.open((BranchId) selectedObject); } } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java index 5817d4dd6c6..2412a7c8fd8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.internal.ServiceUtil; @@ -54,7 +53,7 @@ public class CopyHandler extends AbstractHandler { Object object = iterator.next(); if (object instanceof IAdaptable) { - selectionObject = ((IAdaptable) object).getAdapter(Branch.class); + selectionObject = ((IAdaptable) object).getAdapter(IOseeBranch.class); if (selectionObject == null) { selectionObject = ((IAdaptable) object).getAdapter(Artifact.class); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java index 158a2d4d952..d3f94a1747e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java @@ -24,7 +24,7 @@ import org.eclipse.search.ui.text.Match; /** * This is a utility class for OSEE handlers - * + * * @author Jeff C. Phillips */ public class Handlers { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java index 67cab270128..2ed788eaf2f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers; import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.model.Branch; @@ -45,7 +45,7 @@ public class OpenArtifactExplorerHandler extends CommandHandler { @Override public Object executeWithException(ExecutionEvent event, IStructuredSelection selection) { - List<? extends IOseeBranch> branches = getSelectedBranches(selection); + List<? extends BranchId> branches = getSelectedBranches(selection); if (!branches.isEmpty()) { ArtifactExplorer.exploreBranch(branches.iterator().next()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java index 84a66e9dee5..0e034d0c527 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java @@ -17,7 +17,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactNameConflictHandler; @@ -51,7 +51,7 @@ public class PasteHandler extends AbstractHandler { Object object = iterator.next(); if (object instanceof IAdaptable) { - selectionObject = ((IAdaptable) object).getAdapter(Branch.class); + selectionObject = ((IAdaptable) object).getAdapter(IOseeBranch.class); if (selectionObject == null) { selectionObject = ((IAdaptable) object).getAdapter(Artifact.class); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java index ffd735ffe50..2fdd61c578a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -34,7 +34,7 @@ public class ArchiveBranchHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); return !branches.isEmpty() && AccessControlManager.isOseeAdmin(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java index c756a2780aa..909bcc462c2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.model.Branch; @@ -64,7 +64,7 @@ public class BranchCreationHandler extends CommandHandler { IExceptionableRunnable runnable = new IExceptionableRunnable() { @Override public IStatus run(IProgressMonitor monitor) throws Exception { - IOseeBranch branch = parentTransactionId.getBranch(); + BranchId branch = parentTransactionId.getBranch(); if (branch.equals(CoreBranches.SYSTEM_ROOT)) { BranchManager.createTopLevelBranch(dialog.getEntry()); } else { @@ -93,10 +93,10 @@ public class BranchCreationHandler extends CommandHandler { } Object object = structuredSelection.getFirstElement(); - IOseeBranch branch = null; + BranchId branch = null; - if (object instanceof IOseeBranch) { - branch = (IOseeBranch) object; + if (object instanceof BranchId) { + branch = (BranchId) object; } else if (object instanceof TransactionRecord) { branch = ((TransactionRecord) object).getBranch(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java index a9a1fc34e56..6129f17ee91 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java @@ -19,7 +19,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -98,13 +98,13 @@ public abstract class GeneralBranchHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); return !branches.isEmpty() && (AccessControlManager.isOseeAdmin() || canEnableBranches(branches)); } - private boolean canEnableBranches(List<? extends IOseeBranch> branches) { + private boolean canEnableBranches(List<? extends BranchId> branches) { boolean canBeDeleted = true; - for (IOseeBranch branch : branches) { + for (BranchId branch : branches) { if (!isEnableAllowed(BranchManager.getBranch(branch))) { canBeDeleted = false; break; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java index a121b83d485..cddb06ae44b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java @@ -14,7 +14,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -64,7 +64,7 @@ public class OpenAssociatedArtifactHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); return branches.size() == 1; } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java index ed9c21e7680..7b773496caa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java @@ -16,7 +16,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -54,7 +54,7 @@ public class SetAssociatedBranchArtifactHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); return branches.size() == 1 && AccessControlManager.isOseeAdmin(); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java index b74e53ed3ae..4835dc882f8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java @@ -18,7 +18,7 @@ import org.eclipse.core.commands.Command; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -48,10 +48,10 @@ public class ToggleFavoriteBranchContributionItem extends CompoundContributionPr if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection(); - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); if (!branches.isEmpty()) { - IOseeBranch selectedBranch = branches.iterator().next(); + BranchId selectedBranch = branches.iterator().next(); if (selectedBranch != null) { try { String commandId = ToggleFavoriteBranchHandler.COMMAND_ID; @@ -73,7 +73,7 @@ public class ToggleFavoriteBranchContributionItem extends CompoundContributionPr return contributionItems.toArray(new IContributionItem[0]); } - private CommandContributionItem createCommand(String label, IOseeBranch branch, String commandId) { + private CommandContributionItem createCommand(String label, BranchId branch, String commandId) { CommandContributionItem contributionItem; contributionItem = new CommandContributionItem( diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java index 92f4e6f99d1..9121cbce771 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.branch; import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -43,7 +43,7 @@ public class ToggleFavoriteBranchHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); return branches.size() == 1; } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java index a0be1d9f8b5..814e2150bc9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -123,11 +123,11 @@ public abstract class CommitHandler extends CommandHandler { branch) && !branch.getArchiveState().isArchived(); } protected class CommitJob extends Job { - private final IOseeBranch sourceBranch; - private final IOseeBranch destinationBranch; + private final BranchId sourceBranch; + private final BranchId destinationBranch; private final boolean archiveSourceBranch; - public CommitJob(IOseeBranch sourceBranch, IOseeBranch destinationBranch, boolean archiveSourceBranch) { + public CommitJob(BranchId sourceBranch, BranchId destinationBranch, boolean archiveSourceBranch) { super("Commit Branch"); this.destinationBranch = destinationBranch; this.sourceBranch = sourceBranch; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java index 41ca85f45fd..34ff35250cd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java @@ -17,6 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchType; @@ -77,7 +78,7 @@ public class CommitIntoHandler extends CommitHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) { - List<? extends IOseeBranch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); + List<? extends BranchId> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); return branches.size() == 1; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java index b0a164d74d3..7adc33309d6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.merge; import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -57,7 +57,7 @@ public class MergeManagerHandler extends CommandHandler { List<Branch> branches = Handlers.getBranchesFromStructuredSelection(structuredSelection); if (!branches.isEmpty()) { - IOseeBranch selectedBranch = branches.iterator().next(); + BranchId selectedBranch = branches.iterator().next(); try { if (selectedBranch != null && !ConflictManagerInternal.getDestinationBranchesMerged( selectedBranch.getUuid()).isEmpty()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java index 58db8d011d5..843c53f8e3b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.model.type.AttributeType; @@ -122,7 +123,7 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { return "Deletes the repeat attribute values using a transaction directly on the branch"; } - private Set<AttrData> getRepeatEnumeratedAttrs(IProgressMonitor monitor, IOseeBranch branch) throws OseeCoreException { + private Set<AttrData> getRepeatEnumeratedAttrs(IProgressMonitor monitor, BranchId branch) throws OseeCoreException { Set<AttrData> attrData = new HashSet<>(); JdbcStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java index ed073434abe..394c2e50dd3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java @@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; @@ -77,7 +78,7 @@ public class ArtifactSelectionDialog extends SelectionStatusDialog { branchSelect.setSelection(branch); } - public IOseeBranch getBranch() { + public BranchId getBranch() { return branchSelect.getData(); } @@ -245,7 +246,7 @@ public class ArtifactSelectionDialog extends SelectionStatusDialog { @SuppressWarnings("unchecked") private void refreshItems() { - IOseeBranch branch = getBranch(); + BranchId branch = getBranch(); if (branch != null) { List<Object> data = (List<Object>) treeViewer.getInput(); data.clear(); @@ -254,7 +255,7 @@ public class ArtifactSelectionDialog extends SelectionStatusDialog { } } - private Artifact getBaseArtifact(IOseeBranch branch) { + private Artifact getBaseArtifact(BranchId branch) { Artifact toReturn = null; try { toReturn = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch); 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 6771c652f8b..fd623270a1b 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 @@ -29,6 +29,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.IOperation; @@ -130,7 +131,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor public static void explore(Collection<Artifact> artifacts, IWorkbenchPage page) { Artifact sampleArtifact = null; - IOseeBranch inputBranch = null; + BranchId inputBranch = null; if (artifacts != null && !artifacts.isEmpty()) { sampleArtifact = artifacts.iterator().next(); inputBranch = sampleArtifact.getBranch(); @@ -166,7 +167,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor @Override public void handleEvent(Event event) { try { - IOseeBranch selectedBranch = branchSelect.getData(); + BranchId selectedBranch = branchSelect.getData(); if (selectedBranch != null) { branch = BranchManager.getBranch(selectedBranch); dragAndDropWorker.updateBranch(selectedBranch); @@ -277,7 +278,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor /** * Reveal an artifact in the viewer and select it. */ - public static void exploreBranch(IOseeBranch branch) { + public static void exploreBranch(BranchId branch) { if (branch != null) { IWorkbenchPage page = AWorkbench.getActivePage(); ArtifactExplorerUtil.findView(branch, page); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java index f17b2ec45ab..451a0129575 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java @@ -19,7 +19,7 @@ import org.apache.commons.io.FilenameUtils; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -64,9 +64,9 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { private final TreeViewer treeViewer; private final IViewPart viewPart; - private IOseeBranch selectedBranch; + private BranchId selectedBranch; - public ArtifactExplorerDragAndDrop(TreeViewer treeViewer, String viewId, IViewPart viewPart, IOseeBranch selectedBranch) { + public ArtifactExplorerDragAndDrop(TreeViewer treeViewer, String viewId, IViewPart viewPart, BranchId selectedBranch) { this(treeViewer, viewId, viewPart); this.selectedBranch = selectedBranch; } @@ -78,7 +78,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { this.viewPart = viewPart; } - public void updateBranch(IOseeBranch branch) { + public void updateBranch(BranchId branch) { selectedBranch = branch; } @@ -119,7 +119,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { AccessPolicy policy = ServiceUtil.getAccessPolicy(); Artifact[] artifactsBeingDropped = toBeDropped.getArtifacts(); List<Artifact> artsOnSameBranchAsDestination = new LinkedList<>(); - IOseeBranch destinationBranch = dropTarget.getBranch(); + BranchId destinationBranch = dropTarget.getBranch(); for (Artifact art : artifactsBeingDropped) { if (art.isOnBranch(destinationBranch)) { artsOnSameBranchAsDestination.add(art); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java index 6bf076c1b6e..6825469d0f9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; @@ -48,7 +48,7 @@ public class ArtifactExplorerUtil { // Utility Class } - protected static ArtifactExplorer findView(IOseeBranch inputBranch, IWorkbenchPage page) { + protected static ArtifactExplorer findView(BranchId inputBranch, IWorkbenchPage page) { for (IViewReference view : page.getViewReferences()) { if (view.getId().equals(ArtifactExplorer.VIEW_ID)) { if (view.getView(false) != null && inputBranch.equals( diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java index 66dbe35020f..d326bb115ee 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java @@ -21,9 +21,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreArtifactTokens; -import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; @@ -506,7 +506,7 @@ public class ArtifactExplorerMenu { @Override public void widgetSelected(SelectionEvent ev) { - IOseeBranch branch = BranchSelectionDialog.getBranchFromUser(); + BranchId branch = BranchSelectionDialog.getBranchFromUser(); if (branch != null) { for (Artifact artifact : getSelection().toList()) { try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java index 59ca570d1bd..26569093efb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java @@ -19,7 +19,7 @@ import java.util.Set; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; @@ -50,9 +50,9 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { private final TreeViewer treeViewer; private final String viewId; private boolean isCtrlPressed = false; - private IOseeBranch branch; + private BranchId branch; - public GroupExplorerDragAndDrop(TreeViewer treeViewer, String viewId, IOseeBranch branch) { + public GroupExplorerDragAndDrop(TreeViewer treeViewer, String viewId, BranchId branch) { super(treeViewer.getTree(), viewId); this.treeViewer = treeViewer; this.viewId = viewId; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java index 598e2f63895..9c17530131d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; @@ -55,7 +55,7 @@ public class ArtifactSelectPanel extends AbstractItemSelectPanel<Artifact> { dialog.setMessage(message); dialog.setImage(ImageManager.getImage(FrameworkImage.ARTIFACT_EXPLORER)); dialog.setValidator(new SingleSelectionStatusValidator()); - IOseeBranch branch = lastSelected != null ? lastSelected.getBranch() : COMMON; + BranchId branch = lastSelected != null ? lastSelected.getBranch() : COMMON; dialog.setInput(branch); if (lastSelected != null) { dialog.setInitialSelections(new Object[] {lastSelected}); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java index de9f7255702..2260f1a47bc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.relation.explorer; import java.util.ArrayList; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -54,7 +54,7 @@ public class RelationExplorerWindow { private final ArrayList<Artifact> validArtifacts; private final ArrayList<String> urls; private final ArrayList<String> names; - private IOseeBranch branch; + private BranchId branch; // Private arrays for invalid drops private final ArrayList<String> invalidName; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java index f4b4261f5a1..87a255d2521 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -58,7 +58,7 @@ public class RelationTableViewer { public ArrayList<ArtifactType> fullDescriptorList; - public RelationTableViewer(Table validTable, Table invalidTable, IOseeBranch branch) { + public RelationTableViewer(Table validTable, Table invalidTable, BranchId branch) { try { fullDescriptorList = new ArrayList<>(ArtifactTypeManager.getValidArtifactTypes(branch)); } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java index ff2397cc8a1..27de43c1e62 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.render; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -30,7 +30,7 @@ public class ArtifactGuidToWordML { this.linkBuilder = linkBuilder; } - public List<String> resolveAsOseeLinks(IOseeBranch branch, List<String> artifactGuids) throws OseeCoreException { + public List<String> resolveAsOseeLinks(BranchId branch, List<String> artifactGuids) throws OseeCoreException { List<String> mlLinks = new ArrayList<>(); for (String guid : artifactGuids) { Long uuidFromGuid = ArtifactQuery.getUuidFromGuid(guid, branch); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java index 92e63de5eb1..2fb0eaa5ac1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.List; import java.util.logging.Level; import org.eclipse.core.resources.IFile; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -56,9 +57,9 @@ public abstract class FileSystemRenderer extends DefaultArtifactRenderer { IOseeBranch initialBranch = null; for (Artifact artifact : artifacts) { if (initialBranch == null) { - initialBranch = artifact.getBranch(); + initialBranch = artifact.getBranchToken(); } else { - if (artifact.getBranch() != initialBranch) { + if (!artifact.isOnBranch(initialBranch)) { throw new IllegalArgumentException("All of the artifacts must be on the same branch to be mass edited"); } } @@ -129,5 +130,5 @@ public abstract class FileSystemRenderer extends DefaultArtifactRenderer { } } - protected abstract IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) throws OseeCoreException; + protected abstract IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) throws OseeCoreException; } 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 c3214f56cbb..7ea27cd48da 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 @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -113,7 +114,7 @@ public class HTMLRenderer extends FileSystemRenderer { } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) { return new FileToAttributeUpdateOperation(file, artifacts.get(0), CoreAttributeTypes.PlainTextContent); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java index 558535b4445..8ecfc7c68c8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; @@ -188,7 +188,7 @@ public class JavaRenderer extends FileSystemRenderer { } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) throws OseeCoreException { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) throws OseeCoreException { throw new UnsupportedOperationException(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java index 682ce1cfd70..f12ab4c08da 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -104,7 +104,7 @@ public class NativeRenderer extends FileSystemRenderer { } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) { return new FileToAttributeUpdateOperation(file, artifacts.get(0), CoreAttributeTypes.NativeContent); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java index e065592ab27..0a090e2a4f8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.render; import java.io.File; import java.io.InputStream; import java.util.List; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.types.IArtifact; @@ -50,7 +50,7 @@ public class OpenOfficeWriterRenderer extends FileSystemRenderer implements ITem } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) { throw new UnsupportedOperationException(); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/PlainTextRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/PlainTextRenderer.java index a94fd16d87d..55571469a5b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/PlainTextRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/PlainTextRenderer.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -76,7 +76,7 @@ public class PlainTextRenderer extends FileSystemRenderer { if (presentationType == PresentationType.DIFF && WordUtil.containsWordAnnotations(content)) { throw new OseeStateException( "Trying to diff the [%s] artifact on the [%s] branch, which has tracked changes turned on. All tracked changes must be removed before the artifacts can be compared.", - artifact.getName(), artifact.getBranch().getName()); + artifact.getName(), artifact.getBranchToken().getName()); } stream = Streams.convertStringToInputStream(content, "UTF-8"); } @@ -112,7 +112,7 @@ public class PlainTextRenderer extends FileSystemRenderer { } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) { return new FileToAttributeUpdateOperation(file, artifacts.get(0), CoreAttributeTypes.PlainTextContent); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java index 2ec3f19ccdf..f83278aeeed 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.render; import java.util.List; import java.util.Map.Entry; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache; import org.eclipse.osee.framework.core.model.type.RelationType; @@ -72,7 +72,7 @@ public class RelationOrderRenderer { } - public void toWordML(Producer producer, IOseeBranch branch, RelationOrderData relationOrderData) { + public void toWordML(Producer producer, BranchId branch, RelationOrderData relationOrderData) { WordMLProducer writer = (WordMLProducer) producer; try { writer.startTable(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java index a5c3dabff69..46e3de8426f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.define.report.api.WordArtifactChange; import org.eclipse.osee.define.report.api.WordUpdateChange; import org.eclipse.osee.define.report.api.WordUpdateData; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -43,10 +43,10 @@ import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage; public class UpdateArtifactOperation extends AbstractOperation { private final File workingFile; private final List<Artifact> artifacts; - private final IOseeBranch branch; + private final BranchId branch; private final boolean threeWayMerge; - public UpdateArtifactOperation(File workingFile, List<Artifact> artifacts, IOseeBranch branch, boolean threeWayMerge) { + public UpdateArtifactOperation(File workingFile, List<Artifact> artifacts, BranchId branch, boolean threeWayMerge) { super("Update Artifact", Activator.PLUGIN_ID); this.workingFile = workingFile; this.artifacts = artifacts; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java index 584cd15b9fa..13ffb7c24e2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java @@ -30,7 +30,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.define.report.api.DataRightInput; import org.eclipse.osee.define.report.api.DataRightResult; import org.eclipse.osee.define.report.api.PageOrientation; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet; @@ -101,7 +101,7 @@ public class WholeWordRenderer extends WordRenderer { if (presentationType == PresentationType.DIFF && WordUtil.containsWordAnnotations(content)) { throw new OseeStateException( "Trying to diff the [%s] artifact on the [%s] branch, which has tracked changes turned on. All tracked changes must be removed before the artifacts can be compared.", - artifact.getName(), artifact.getBranch().getName()); + artifact.getName(), artifact.getBranchToken().getName()); } Set<String> unknownGuids = new HashSet<>(); @@ -128,7 +128,7 @@ public class WholeWordRenderer extends WordRenderer { } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) { return new FileToAttributeUpdateOperation(file, artifacts.get(0), CoreAttributeTypes.WholeWordContent); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java index ff866213c79..3c247b0cdea 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java @@ -28,7 +28,7 @@ import javax.xml.stream.XMLStreamWriter; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.define.report.api.ReportConstants; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -267,7 +267,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende } @Override - protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) { + protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) { return new UpdateArtifactOperation(file, artifacts, branch, false); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordExtractorData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordExtractorData.java index ff4ce86e8d6..0559d952714 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordExtractorData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordExtractorData.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.artifactElement; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -47,7 +47,7 @@ public class WordExtractorData { return parent; } - public Artifact getArtifact(IOseeBranch branch) throws OseeCoreException { + public Artifact getArtifact(BranchId branch) throws OseeCoreException { if (artifact == null && Strings.isValid(getGuid())) { artifact = ArtifactQuery.getArtifactFromId(getGuid(), branch, DeletionFlag.INCLUDE_DELETED); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java index 1182bcf3bb9..ca0ca9add56 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OperationTimedoutException; @@ -63,7 +64,7 @@ public abstract class AbstractWordCompare implements IComparator { return renderer; } - protected IVbaDiffGenerator createGenerator(List<Artifact> artifacts, IOseeBranch branch, PresentationType presentationType) throws OseeCoreException { + protected IVbaDiffGenerator createGenerator(List<Artifact> artifacts, BranchId branch, PresentationType presentationType) throws OseeCoreException { boolean show = !getRenderer().getBooleanOption(IRenderer.NO_DISPLAY); boolean executeVbScript = System.getProperty("os.name").contains("Windows"); boolean skipErrors = !getRenderer().getBooleanOption(IRenderer.SKIP_ERRORS); @@ -80,7 +81,7 @@ public abstract class AbstractWordCompare implements IComparator { if (artifact == null) { artifact = artifactDelta.getEndArtifact(); } - IOseeBranch branch = artifact.getBranch(); + IOseeBranch branch = artifact.getBranchToken(); IVbaDiffGenerator diffGenerator = createGenerator(Collections.singletonList(artifact), branch, presentationType); @@ -103,7 +104,7 @@ public abstract class AbstractWordCompare implements IComparator { @Override public void compare(CompareDataCollector collector, Artifact baseVersion, Artifact newerVersion, IFile baseFile, IFile newerFile, PresentationType presentationType, String pathPrefix) throws OseeCoreException { - IOseeBranch branch = (baseVersion != null ? baseVersion : newerVersion).getBranch(); + IOseeBranch branch = (baseVersion != null ? baseVersion : newerVersion).getBranchToken(); String resultPath = getDiffPath(baseVersion, newerVersion, presentationType, pathPrefix); String vbsPath = RenderingUtil.getRenderPath(renderer, branch, presentationType, null, "compareDocs", ".vbs"); @@ -128,7 +129,7 @@ public abstract class AbstractWordCompare implements IComparator { Artifact artifact = baseVersion != null ? baseVersion : newerVersion; List<Artifact> artifacts = Collections.singletonList(artifact); String diffPath = - RenderingUtil.getRenderPath(renderer, artifacts, artifact.getBranch(), presentationType, prefix, ".xml"); + RenderingUtil.getRenderPath(renderer, artifacts, artifact.getBranchToken(), presentationType, prefix, ".xml"); return diffPath; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java index 0473eed68f5..3ec2ea5dca9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java @@ -53,7 +53,7 @@ public class WordTemplateCompare extends AbstractWordCompare { if (artifact == null) { artifact = artifactDelta1.getEndArtifact(); } - IOseeBranch branch = artifact.getBranch(); + IOseeBranch branch = artifact.getBranchToken(); List<Artifact> artifacts = Collections.emptyList(); IVbaDiffGenerator diffGenerator = createGenerator(artifacts, branch, presentationType); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java index 9ab53db0152..adeea596b71 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionDelta; @@ -126,7 +126,7 @@ public final class WordTemplateFileDiffer { for (Change change : changes) { changeIds.add(change.getArtId()); } - IOseeBranch endBranch = txDelta.getEndTx().getBranch(); + BranchId endBranch = txDelta.getEndTx().getBranch(); // loop through all artifacts that are on the IS branch for (Artifact art : endArtifacts) { Integer artId = art.getArtId(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index bf97ee3f28c..3d06d8d6560 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.help.ui.OseeHelpContext; @@ -152,15 +152,15 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl @Override public void handleEvent(Event event) { - IOseeBranch branch = branchSelect.getSelection(); + BranchId branch = branchSelect.getSelection(); if (!isBranchReadable(branch)) { AWorkbench.popup(String.format("Read Access Denied for branch [%s]", branch)); } } } - private IOseeBranch getSelectedBranch() { - IOseeBranch branch = branchSelect.getData(); + private BranchId getSelectedBranch() { + BranchId branch = branchSelect.getData(); if (branch == null) { branch = BranchManager.getLastBranch(); } @@ -538,7 +538,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl } } - private static boolean isBranchReadable(IOseeBranch branch) { + private static boolean isBranchReadable(BranchId branch) { boolean read = false; if (branch != null) { read = AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java index 6345aaa331e..a33fb96958b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java @@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; @@ -63,7 +63,7 @@ public class AttributeFindReplaceDialog extends Dialog { private ComboViewer cmbAttributeDescriptors; private Text txtFindRegEx; private Text txtReplaceStr; - private IOseeBranch branch; + private BranchId branch; private final List<Artifact> artifacts; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java index ebbbc127215..f9ffe1470d4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.search; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -26,10 +26,10 @@ import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModelList; */ public class FilterArtifactSearchQuery extends AbstractLegacyArtifactSearchQuery { private final FilterModelList filterList; - private final IOseeBranch branch; + private final BranchId branch; private String criteriaLabel = ""; - public FilterArtifactSearchQuery(FilterModelList filterList, IOseeBranch branch) { + public FilterArtifactSearchQuery(FilterModelList filterList, BranchId branch) { this.filterList = filterList; this.branch = branch; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java index 78ff43d3016..edb0858cf84 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java @@ -16,7 +16,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -28,10 +28,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.QueryBuilderArtifa */ final class IdArtifactSearch extends AbstractLegacyArtifactSearchQuery { private final String searchString; - private final IOseeBranch branchToSearch; + private final BranchId branchToSearch; private final DeletionFlag allowDeleted; - IdArtifactSearch(String searchString, IOseeBranch branchToSearch, DeletionFlag allowDeleted) { + IdArtifactSearch(String searchString, BranchId branchToSearch, DeletionFlag allowDeleted) { super(); this.searchString = searchString; this.branchToSearch = branchToSearch; 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 146411e0305..26eb16a316f 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 @@ -21,6 +21,7 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.PermissionEnum; @@ -98,7 +99,7 @@ public class QuickSearchView extends GenericViewPart { if (DbConnectionExceptionComposite.dbConnectionIsOk() && memento != null) { if (Widgets.isAccessible(attrSearchComposite)) { memento.putString(LAST_QUERY_KEY_ID, attrSearchComposite.getQuery()); - IOseeBranch branch = branchSelect.getData(); + BranchId branch = branchSelect.getData(); if (branch != null) { memento.putString(LAST_BRANCH_UUID, String.valueOf(branch.getUuid())); } @@ -264,7 +265,7 @@ public class QuickSearchView extends GenericViewPart { public void handleEvent(Event event) { if (Widgets.isAccessible(branchLabel) && branchSelect != null) { branchLabel.setText(""); - final IOseeBranch branch = branchSelect.getData(); + final BranchId branch = branchSelect.getData(); if (branch == null) { branchLabel.setText("Error: Must Select a Branch"); } else if (!AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ)) { @@ -300,7 +301,7 @@ public class QuickSearchView extends GenericViewPart { public void handleEvent(Event event) { if (Widgets.isAccessible(branchLabel) && branchSelect != null) { branchLabel.setText(""); - final IOseeBranch branch = branchSelect.getData(); + final BranchId branch = branchSelect.getData(); if (branch == null) { branchLabel.setText("Error: Must Select a Branch"); } else if (!AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ)) { 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 8db291cc4b6..ae27e0f3ad3 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 @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.widgets; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.util.Result; @@ -19,7 +20,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; /** * Branch Selection with branch uuid storage as String - * + * * @author Donald G. Dunne */ public class XBranchSelectByWidgetDam extends XBranchSelectWidget implements IAttributeWidget { @@ -48,7 +49,7 @@ public class XBranchSelectByWidgetDam extends XBranchSelectWidget implements IAt @Override public void saveToArtifact() throws OseeCoreException { - IOseeBranch selection = getSelection(); + BranchId selection = getSelection(); if (selection == null) { artifact.deleteAttributes(attributeType); } else { @@ -66,7 +67,7 @@ public class XBranchSelectByWidgetDam extends XBranchSelectWidget implements IAt if (isEditable()) { try { Long storedUuid = getStoredUuid(); - IOseeBranch widgetInput = getSelection(); + BranchId widgetInput = getSelection(); Long widgetUuid = widgetInput == null ? 0L : widgetInput.getUuid(); if (!storedUuid.equals(widgetUuid)) { return new Result(true, getAttributeType() + " is dirty"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java index 6b6a277e738..5057aecd092 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite; @@ -110,7 +111,7 @@ public class XBranchSelectWidget extends GenericXWidget implements Listener { } @Override - public IOseeBranch getData() { + public BranchId getData() { return getSelection(); } 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 41111a136e8..1c7b21701ca 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 @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.widgets; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.util.Result; @@ -20,7 +21,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; /** * Branch Selection with branch uuid storage as String - * + * * @author Donald G. Dunne */ public class XBranchSelectWidgetDam extends XBranchSelectWidget implements IAttributeWidget { @@ -54,7 +55,7 @@ public class XBranchSelectWidgetDam extends XBranchSelectWidget implements IAttr @Override public void saveToArtifact() throws OseeCoreException { - IOseeBranch selection = getSelection(); + BranchId selection = getSelection(); if (selection == null) { artifact.deleteAttributes(attributeType); } else { @@ -72,7 +73,7 @@ public class XBranchSelectWidgetDam extends XBranchSelectWidget implements IAttr if (isEditable()) { try { Long storedUuid = getStoredUuid(); - IOseeBranch widgetInput = getSelection(); + BranchId widgetInput = getSelection(); Long widgetUuid = widgetInput == null ? 0L : widgetInput.getUuid(); if (!storedUuid.equals(widgetUuid)) { return new Result(true, getAttributeType() + " is dirty"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java index 8766d9c6569..941755e2eed 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java @@ -18,7 +18,7 @@ import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.operation.ClientLogger; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -115,7 +115,7 @@ public class XListDropViewer extends XListViewer implements IXWidgetInputAddable try { TextTransfer transfer = TextTransfer.getInstance(); String data = (String) cb.getContents(transfer); - IOseeBranch branch = BranchSelectionDialog.getBranchFromUser(); + BranchId branch = BranchSelectionDialog.getBranchFromUser(); Operations.executeAsJob(new StringGuidsToArtifactListOperation(new ClientLogger(Activator.class), data, branch, XListDropViewer.this), true); } finally { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java index d3f8d25c48e..d21ac616d1f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java @@ -135,7 +135,7 @@ public abstract class XSelectFromDialog<T> extends XText { } } - public void setSelectableItems(Collection<T> input) { + public void setSelectableItems(Collection<? extends T> input) { this.input.clear(); this.input.addAll(input); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java index 9fc88d82be6..de566e55411 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.Collections; import java.util.List; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchType; @@ -25,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; /** * @author Roberto E. Escobar */ -public class XSelectFromMultiChoiceBranch extends XSelectFromDialog<IOseeBranch> { +public class XSelectFromMultiChoiceBranch extends XSelectFromDialog<BranchId> { public XSelectFromMultiChoiceBranch(String displayLabel) { super(displayLabel); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java index aa6f0f55ac3..09d3dbd34e8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -30,7 +30,7 @@ public abstract class XTypeListViewer extends XListViewer { setSorter(new ViewerSorter()); } - public IOseeBranch resolveBranch(long branchUuid) { + public BranchId resolveBranch(long branchUuid) { try { return BranchManager.getBranch(branchUuid); } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java index 67f9fcd6181..5305d7d1a4c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.IShellCloseEvent; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite; @@ -158,7 +158,7 @@ public class EntryDialogWithBranchSelect extends MessageDialog { this.entryText = entry; } - public IOseeBranch getBranch() { + public BranchId getBranch() { return branchSelect.getSelectedBranch(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java index 4a00363ef76..94d43894855 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -32,34 +32,34 @@ import org.eclipse.swt.widgets.Control; */ public class FilteredCheckboxBranchDialog extends FilteredCheckboxTreeDialog { - private Collection<? extends IOseeBranch> selectable; + private Collection<? extends BranchId> selectable; - public FilteredCheckboxBranchDialog(String title, String message, Collection<? extends IOseeBranch> selectable) { + public FilteredCheckboxBranchDialog(String title, String message, Collection<? extends BranchId> selectable) { this(title, message, selectable, new ArrayTreeContentProvider(), new BranchLabelProvider()); } - public FilteredCheckboxBranchDialog(String title, String message, Collection<? extends IOseeBranch> selectable, ILabelProvider labelProvider) { + public FilteredCheckboxBranchDialog(String title, String message, Collection<? extends BranchId> selectable, ILabelProvider labelProvider) { this(title, message, selectable, new ArrayTreeContentProvider(), labelProvider); } - public FilteredCheckboxBranchDialog(String title, String message, Collection<? extends IOseeBranch> selectable, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + public FilteredCheckboxBranchDialog(String title, String message, Collection<? extends BranchId> selectable, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { super(title, message, contentProvider, labelProvider, new BranchNameSorter()); this.selectable = selectable; } - public FilteredCheckboxBranchDialog(String title, Collection<? extends IOseeBranch> selectable) { + public FilteredCheckboxBranchDialog(String title, Collection<? extends BranchId> selectable) { this(title, title, selectable, new BranchLabelProvider()); } @SuppressWarnings("unchecked") @Override - public Collection<IOseeBranch> getChecked() { + public Collection<BranchId> getChecked() { if (super.getTreeViewer() == null) { return Collections.emptyList(); } - Set<IOseeBranch> checked = new HashSet<>(); + Set<BranchId> checked = new HashSet<>(); for (Object obj : getResult()) { - checked.add((IOseeBranch) obj); + checked.add((BranchId) obj); } return checked; } @@ -80,11 +80,11 @@ public class FilteredCheckboxBranchDialog extends FilteredCheckboxTreeDialog { return super.isComplete(); } - public Collection<? extends IOseeBranch> getSelectable() { + public Collection<? extends BranchId> getSelectable() { return selectable; } - public void setSelectable(Collection<IOseeBranch> selectable) { + public void setSelectable(Collection<BranchId> selectable) { this.selectable = selectable; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeBranchDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeBranchDialog.java index 48de69c9dee..fc250a8ab22 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeBranchDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeBranchDialog.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.dialog; import java.util.Collection; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -29,22 +29,22 @@ import org.eclipse.swt.widgets.Control; */ public class FilteredTreeBranchDialog extends FilteredTreeDialog { - private Collection<? extends IOseeBranch> selectable; + private Collection<? extends BranchId> selectable; - public FilteredTreeBranchDialog(String title, String message, Collection<? extends IOseeBranch> selectable, ILabelProvider labelProvider) { + public FilteredTreeBranchDialog(String title, String message, Collection<? extends BranchId> selectable, ILabelProvider labelProvider) { this(title, message, selectable, new ArrayTreeContentProvider(), labelProvider); } - public FilteredTreeBranchDialog(String title, String message, Collection<? extends IOseeBranch> selectable, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + public FilteredTreeBranchDialog(String title, String message, Collection<? extends BranchId> selectable, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { super(title, message, contentProvider, labelProvider, new BranchNameSorter()); this.selectable = selectable; } - public FilteredTreeBranchDialog(String title, Collection<? extends IOseeBranch> selectable) { + public FilteredTreeBranchDialog(String title, Collection<? extends BranchId> selectable) { this(title, title, selectable, new BranchLabelProvider()); } - public FilteredTreeBranchDialog(String title, String message, Collection<? extends IOseeBranch> selectable) { + public FilteredTreeBranchDialog(String title, String message, Collection<? extends BranchId> selectable) { this(title, message, selectable, new BranchLabelProvider()); } @@ -64,7 +64,7 @@ public class FilteredTreeBranchDialog extends FilteredTreeDialog { return super.isComplete(); } - public void setSelectable(Collection<IOseeBranch> selectable) { + public void setSelectable(Collection<BranchId> selectable) { this.selectable = selectable; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java index 225cb775869..68e4f7962a3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java @@ -23,7 +23,7 @@ import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.model.Branch; @@ -119,7 +119,7 @@ public class XBranchContentProvider implements ITreeContentProvider { branchTypes.add(BranchType.WORKING); } - Set<IOseeBranch> branchesToReturn = new HashSet<>(); + Set<BranchId> branchesToReturn = new HashSet<>(); if (showOnlyWorkingBranches) { branchesToReturn.addAll(BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING)); } @@ -131,7 +131,7 @@ public class XBranchContentProvider implements ITreeContentProvider { BranchFilter filter = new BranchFilter(branchState, branchTypes.toArray(new BranchType[branchTypes.size()])); - for (IOseeBranch branch : BranchManager.getBranches(filter)) { + for (BranchId branch : BranchManager.getBranches(filter)) { if (BranchManager.isParentSystemRoot(branch)) { branchesToReturn.add(branch); } @@ -153,7 +153,7 @@ public class XBranchContentProvider implements ITreeContentProvider { return null; } - private Collection<Object> getTransactions(IOseeBranch branch) throws OseeCoreException { + private Collection<Object> getTransactions(BranchId branch) throws OseeCoreException { if (!showTransactions) { return Collections.emptyList(); } 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 c250774eb4b..8f3c7d88609 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 @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.nebula.widgets.xviewer.XViewerCells; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.model.Branch; @@ -208,9 +208,9 @@ public class XBranchLabelProvider extends XViewerLabelProvider { @Override public Image getColumnImage(Object element, XViewerColumn xCol, int columnIndex) { if (xCol.equals(BranchXViewerFactory.associatedArtifact)) { - if (element instanceof IOseeBranch) { + if (element instanceof BranchId) { try { - Artifact associatedArtifact = BranchManager.getAssociatedArtifact((IOseeBranch) element); + Artifact associatedArtifact = BranchManager.getAssociatedArtifact((BranchId) element); if (!associatedArtifact.equals(SystemUser.OseeSystem)) { return ArtifactImageManager.getImage(associatedArtifact); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java index 6dc81f43a5c..a5b92616324 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java @@ -23,6 +23,7 @@ import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -69,7 +70,7 @@ public class XBranchWidget extends GenericXWidget { private final boolean filterRealTime; private final boolean searchRealTime; private ToolBar toolBar; - private final IOseeBranch selectedBranch; + private final BranchId selectedBranch; private final List<BranchSelectedListener> branchSelectedListeners; private BranchXViewerFactory branchXViewerFactory; private final IBranchWidgetMenuListener menuListener; @@ -78,7 +79,7 @@ public class XBranchWidget extends GenericXWidget { this(false, false, null, menuListener); } - public XBranchWidget(boolean filterRealTime, boolean searchRealTime, IOseeBranch selectedBranch, IBranchWidgetMenuListener menuListener) { + public XBranchWidget(boolean filterRealTime, boolean searchRealTime, BranchId selectedBranch, IBranchWidgetMenuListener menuListener) { super(VIEW_ID); this.filterRealTime = filterRealTime; this.searchRealTime = searchRealTime; @@ -356,7 +357,7 @@ public class XBranchWidget extends GenericXWidget { public interface BranchSelectedListener { - public void onBranchSelected(IOseeBranch branch); + public void onBranchSelected(BranchId branch); } public interface IBranchWidgetMenuListener { public void updateMenuActionsForTable(MenuManager mm); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/actions/SetAsFavoriteAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/actions/SetAsFavoriteAction.java index 1ef618e0bb1..f7a9716ac68 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/actions/SetAsFavoriteAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/actions/SetAsFavoriteAction.java @@ -15,6 +15,7 @@ import java.util.logging.Level; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; @@ -60,7 +61,7 @@ public class SetAsFavoriteAction extends Action { } if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Toggle Branch Favorites", "Toggle Branch Favorites for " + branches.size() + " branch(s)")) { - for (IOseeBranch branch : branches) { + for (BranchId branch : branches) { user.toggleFavoriteBranch(branch); } user.persist("Toggle Branch Favorites"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java index 0bc0bec7245..1c220b3f836 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java @@ -24,7 +24,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -161,7 +161,7 @@ public class XHistoryWidget extends GenericXWidget { if (dialog.open() == 0) { String guid = dialog.getEntry(); Conditions.checkNotNullOrEmpty(guid, "GUID"); - IOseeBranch branch = dialog.getBranch(); + BranchId branch = dialog.getBranch(); Conditions.checkNotNull(branch, "Branch"); Artifact art = ArtifactQuery.getArtifactFromId(guid, branch, DeletionFlag.EXCLUDE_DELETED); if (art != null) { 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 52be6275dba..bd37be1bf71 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 @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.MergeBranch; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -334,7 +333,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, private boolean conflictInvovlesArtifact(Artifact artifact, Conflict conflict) { if (artifact.getArtId() == conflict.getArtId()) { - IOseeBranch branch = artifact.getBranch(); + BranchId branch = artifact.getBranch(); return branch.equals(conflict.getSourceBranch()) || branch.equals(conflict.getDestBranch()); } return false; @@ -373,7 +372,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, } for (Artifact artifact : modifiedArts) { try { - IOseeBranch branch = artifact.getBranch(); + BranchId branch = artifact.getBranch(); if (showConflicts) { Conflict[] conflicts = getConflicts(); for (Conflict conflict : conflicts) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java index 8c0c9133a15..7ae51000c27 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java @@ -26,7 +26,7 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.ConflictStatus; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; @@ -414,7 +414,7 @@ public class MergeXWidget extends GenericXWidget { } } - private void refreshAssociatedArtifactItem(IOseeBranch sourceBranch) { + private void refreshAssociatedArtifactItem(BranchId sourceBranch) { try { IArtifact branchAssociatedArtifact = BranchManager.getAssociatedArtifact(sourceBranch); if (branchAssociatedArtifact != null) { |