Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-09-11 21:08:29 +0000
committerRoberto E. Escobar2012-09-11 21:08:29 +0000
commit580c0c7e7b74c4b3f1452e4edf443609c1229e83 (patch)
treef5a4fa5ca4de21249e8927b37e2b1b6a3054b814
parentaa1423d3f2dbe374147d55657c2e49a5f7d74a8c (diff)
downloadorg.eclipse.osee-580c0c7e7b74c4b3f1452e4edf443609c1229e83.tar.gz
org.eclipse.osee-580c0c7e7b74c4b3f1452e4edf443609c1229e83.tar.xz
org.eclipse.osee-580c0c7e7b74c4b3f1452e4edf443609c1229e83.zip
bug: Re-enable pre-branch commit checks
Checks were disabled by commit: "feature[ats_XKH70]: Add new ASCII SW Requirement artifact type"
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index c57000a4382..da867c3b28c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -54,6 +54,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.operation.FinishUpdateBra
import org.eclipse.osee.framework.skynet.core.artifact.operation.UpdateBranchOperation;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.artifact.update.ConflictResolverOperation;
+import org.eclipse.osee.framework.skynet.core.commit.actions.CommitAction;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.httpRequests.CommitBranchHttpRequestOperation;
import org.eclipse.osee.framework.skynet.core.httpRequests.CreateBranchHttpRequestOperation;
@@ -294,12 +295,12 @@ public class BranchManager {
}
private static void runCommitExtPointActions(ConflictManagerExternal conflictManager) throws OseeCoreException {
- // ExtensionDefinedObjects<CommitAction> extensions =
- // new ExtensionDefinedObjects<CommitAction>("org.eclipse.osee.framework.skynet.core.CommitActions",
- // "CommitActions", "className");
- // for (CommitAction commitAction : extensions.getObjects()) {
- // commitAction.runCommitAction(conflictManager.getSourceBranch(), conflictManager.getDestinationBranch());
- // }
+ ExtensionDefinedObjects<CommitAction> extensions =
+ new ExtensionDefinedObjects<CommitAction>("org.eclipse.osee.framework.skynet.core.CommitActions",
+ "CommitActions", "className");
+ for (CommitAction commitAction : extensions.getObjects()) {
+ commitAction.runCommitAction(conflictManager.getSourceBranch(), conflictManager.getDestinationBranch());
+ }
}
/**

Back to the top