Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2016-08-04 21:50:54 +0000
committerRyan D. Brooks2016-08-31 16:18:17 +0000
commit509bea4523091bf366478636020e2e6ce7c433c5 (patch)
tree2a3e80f1c7cee2a8c6f6661a19e71dd057bde83e
parent256f2f783a48eadc8c0f7161567cc059cbe9c968 (diff)
downloadorg.eclipse.osee-509bea4523091bf366478636020e2e6ce7c433c5.tar.gz
org.eclipse.osee-509bea4523091bf366478636020e2e6ce7c433c5.tar.xz
org.eclipse.osee-509bea4523091bf366478636020e2e6ce7c433c5.zip
bug[ats_ATS306962]: Change Report - Purge Transaction is disabled
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java6
4 files changed, 12 insertions, 14 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java
index b28cbaf8864..4d9bdc57eed 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osee.framework.core.data.TransactionId;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -42,13 +42,13 @@ import org.eclipse.osee.framework.ui.swt.ImageManager;
public class PurgeTransactionAction extends Action {
private static final String NAME = "Purge Transaction";
- private final List<TransactionRecord> transactions;
+ private final List<TransactionToken> transactions;
public PurgeTransactionAction() {
- this(new ArrayList<TransactionRecord>());
+ this(new ArrayList<TransactionToken>());
}
- public PurgeTransactionAction(List<TransactionRecord> transactions) {
+ public PurgeTransactionAction(List<TransactionToken> transactions) {
super(NAME);
this.transactions = transactions;
setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.PURGE));
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java
index eba04857080..02d427a05d6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.action;
-import static org.eclipse.osee.framework.core.data.TransactionId.SENTINEL;
import java.net.URI;
import java.util.List;
import javax.ws.rs.core.MediaType;
@@ -21,9 +20,8 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.core.client.OseeClientProperties;
-import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.data.TransactionId;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -77,7 +75,7 @@ public class WasIsCompareEditorAction extends Action {
return;
}
Change change = localChanges.iterator().next();
- List<TransactionRecord> transactionsFromStructuredSelection =
+ List<TransactionToken> transactionsFromStructuredSelection =
Handlers.getTransactionsFromStructuredSelection(structuredSelection);
TransactionId transactionId = transactionsFromStructuredSelection.iterator().next();
List<Artifact> artifactsFromStructuredSelection =
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 c777c5cec53..fdb6221eac3 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
@@ -16,7 +16,7 @@ import java.util.List;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
@@ -41,8 +41,8 @@ public class Handlers {
* Populates a list of TransactionIds from a IStructuredSelection. Returns an empty list if no TransactionIds were
* found.
*/
- public static List<TransactionRecord> getTransactionsFromStructuredSelection(IStructuredSelection structuredSelection) {
- return processSelectionObjects(TransactionRecord.class, structuredSelection);
+ public static List<TransactionToken> getTransactionsFromStructuredSelection(IStructuredSelection structuredSelection) {
+ return processSelectionObjects(TransactionToken.class, structuredSelection);
}
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java
index 3cd711203ab..44a7b576070 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.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.model.TransactionRecord;
+import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.action.PurgeTransactionAction;
@@ -27,7 +27,7 @@ public class PurgeTransactionHandler extends CommandHandler {
@Override
public Object executeWithException(ExecutionEvent event, IStructuredSelection selection) throws OseeCoreException {
- List<TransactionRecord> transactions = Handlers.getTransactionsFromStructuredSelection(selection);
+ List<TransactionToken> transactions = Handlers.getTransactionsFromStructuredSelection(selection);
PurgeTransactionAction action = new PurgeTransactionAction(transactions);
action.run();
@@ -37,7 +37,7 @@ public class PurgeTransactionHandler extends CommandHandler {
@Override
public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException {
- List<TransactionRecord> transactions = Handlers.getTransactionsFromStructuredSelection(structuredSelection);
+ List<TransactionToken> transactions = Handlers.getTransactionsFromStructuredSelection(structuredSelection);
return transactions.size() > 0 && AccessControlManager.isOseeAdmin();
}
} \ No newline at end of file

Back to the top