diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers')
17 files changed, 44 insertions, 45 deletions
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()) { |