diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change')
8 files changed, 26 insertions, 33 deletions
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 f1ed22820ca..e63a473d82b 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 @@ -41,9 +41,7 @@ public final class ChangeUiUtil { Branch heavyBranch = BranchManager.getBranch(branch); Conditions.checkNotNull(branch, "Branch"); if (heavyBranch.getBranchType() == BranchType.BASELINE) { - if (!MessageDialog.openConfirm( - AWorkbench.getActiveShell(), - "Show Change Report", + if (!MessageDialog.openConfirm(AWorkbench.getActiveShell(), "Show Change Report", "You have chosen to show a " + (showTransactionTab ? "transaction report" : "change report") + " for a BASLINE branch.\n\n" + // "This could be a very long running task and consume large resources.\n\nAre you sure?")) { return; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java index 6f5275cf531..db598aaa535 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java @@ -49,9 +49,8 @@ public class OpenQuickSearchAction extends Action { try { IOseeBranch branch = branchProvider.getBranch(monitor); if (branch != null) { - IViewPart viewPart = - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView( - QuickSearchView.VIEW_ID); + IViewPart viewPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView( + QuickSearchView.VIEW_ID); if (viewPart != null) { ((QuickSearchView) viewPart).setBranch(branch); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadBranchTransactionsOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadBranchTransactionsOperation.java index 450844eb670..6dd0574d811 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadBranchTransactionsOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadBranchTransactionsOperation.java @@ -28,8 +28,8 @@ public class LoadBranchTransactionsOperation extends AbstractOperation { @Override protected void doWork(IProgressMonitor monitor) throws Exception { - branchTransactionData.setTransactions(branchTransactionData.getBranchContentProvider().getBranchChildren( - branchTransactionData.getBranch())); + branchTransactionData.setTransactions( + branchTransactionData.getBranchContentProvider().getBranchChildren(branchTransactionData.getBranch())); } } 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 e820db43c2c..403fb2bf63f 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 @@ -67,16 +67,14 @@ public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler TransactionDelta txDelta = changeUiData.getTxDelta(); String data; 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())); + 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())); } 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())); + 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())); } 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 5327a94cf82..7c60479dfdf 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 @@ -67,16 +67,14 @@ public final class CurrentsAgainstParentHandler implements IChangeReportUiHandle TransactionDelta txDelta = changeUiData.getTxDelta(); String data; 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())); + 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())); } 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())); + 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())); } return data; } 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 35d45cdf2bb..7646a3b4dbb 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 @@ -148,9 +148,8 @@ public class BranchTransactionPage extends FormPage implements IBranchWidgetMenu public void recomputeBranchTransactions(boolean isReloadAllowed) { OperationBuilder builder = Operations.createBuilder("Load Branch Transactions"); - branchTransactionData = - new BranchTransactionUiData(BranchManager.getBranch(getEditorInput().getBranch()), - (XBranchContentProvider) xBranchWidget.getXViewer().getContentProvider()); + branchTransactionData = new BranchTransactionUiData(BranchManager.getBranch(getEditorInput().getBranch()), + (XBranchContentProvider) xBranchWidget.getXViewer().getContentProvider()); builder.addOp(new LoadBranchTransactionsOperation(branchTransactionData)); builder.addOp(new LoadAssociatedArtifactOperation(getEditor().getChanges())); Operations.executeAsJob(builder.build(), true, Job.LONG, new ReloadJobChangeAdapter()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java index c2408059a71..bfa2dac08b3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java @@ -100,8 +100,8 @@ public class ChangeReportPage extends FormPage { int sectionStyle = ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED | ExpandableComposite.TWISTIE; - managedForm.addPart(new EditorSection(infoPresenter, "Info", form.getBody(), managedForm.getToolkit(), - sectionStyle, false)); + managedForm.addPart( + new EditorSection(infoPresenter, "Info", form.getBody(), managedForm.getToolkit(), sectionStyle, false)); // Can not place table in section or double scroll-bars and maintaining correct table size becomes an issue changeReportTable.onCreate(getManagedForm(), form.getBody()); @@ -126,7 +126,8 @@ public class ChangeReportPage extends FormPage { Menu menu = manager.createContextMenu(control); control.setMenu(menu); - getSite().registerContextMenu("org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeView", manager, xviewer); + getSite().registerContextMenu("org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeView", manager, + xviewer); getSite().setSelectionProvider(changeReportTable.getXViewer()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java index c24e6db7781..e00ed8061af 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java @@ -140,7 +140,7 @@ public class ChangeReportTable implements EditorSection.IWidget { for (Object object : selection.toArray()) { if (object instanceof IAdaptable) { - Artifact artifact = (Artifact) ((IAdaptable) object).getAdapter(Artifact.class); + Artifact artifact = ((IAdaptable) object).getAdapter(Artifact.class); if (artifact != null) { artifacts.add(artifact); |