1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java
index fc9d6b388a1..86b4e314816 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.skynet.core.artifact;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.osee.framework.core.data.OseeServerContext;
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
@@ -24,7 +25,6 @@ import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.services.IAccessControlService;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -40,18 +40,18 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
 public class HttpCommitDataRequester {
 
    private static final String ARTIFACT_CHANGES =
-         "SELECT av.art_id, txs1.branch_id FROM osee_txs txs1, osee_artifact av WHERE txs1.branch_id = ? AND txs1.transaction_id = ? AND txs1.gamma_id = av.gamma_id " + "UNION ALL " + "SELECT art.art_id, txs2.branch_id FROM osee_txs txs2, osee_relation_link rel, osee_artifact art WHERE txs2.branch_id = ? and txs2.transaction_id = ? AND txs2.gamma_id = rel.gamma_id AND (rel.a_art_id = art.art_id OR rel.b_art_id = art.art_id) " + "UNION ALL " + "SELECT att.art_id, txs3.branch_id FROM osee_txs txs3, osee_attribute att WHERE txs3.branch_id = ? AND txs3.transaction_id = ? AND txs3.gamma_id = att.gamma_id";
+      "SELECT av.art_id, txs1.branch_id FROM osee_txs txs1, osee_artifact av WHERE txs1.branch_id = ? AND txs1.transaction_id = ? AND txs1.gamma_id = av.gamma_id " + "UNION ALL " + "SELECT art.art_id, txs2.branch_id FROM osee_txs txs2, osee_relation_link rel, osee_artifact art WHERE txs2.branch_id = ? and txs2.transaction_id = ? AND txs2.gamma_id = rel.gamma_id AND (rel.a_art_id = art.art_id OR rel.b_art_id = art.art_id) " + "UNION ALL " + "SELECT att.art_id, txs3.branch_id FROM osee_txs txs3, osee_attribute att WHERE txs3.branch_id = ? AND txs3.transaction_id = ? AND txs3.gamma_id = att.gamma_id";
 
    public static void commitBranch(IProgressMonitor monitor, User user, Branch sourceBranch, Branch destinationBranch, boolean isArchiveAllowed) throws OseeCoreException {
       Map<String, String> parameters = new HashMap<String, String>();
       parameters.put("function", Function.BRANCH_COMMIT.name());
 
       BranchCommitRequest requestData =
-            new BranchCommitRequest(user.getArtId(), sourceBranch.getId(), destinationBranch.getId(), isArchiveAllowed);
+         new BranchCommitRequest(user.getArtId(), sourceBranch.getId(), destinationBranch.getId(), isArchiveAllowed);
 
       BranchCommitResponse response =
-            HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters,
-                  CoreTranslatorId.BRANCH_COMMIT_REQUEST, requestData, CoreTranslatorId.BRANCH_COMMIT_RESPONSE);
+         HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, CoreTranslatorId.BRANCH_COMMIT_REQUEST,
+            requestData, CoreTranslatorId.BRANCH_COMMIT_RESPONSE);
 
       if (response != null) {
          handleResponse(response, sourceBranch);
@@ -68,7 +68,7 @@ public class HttpCommitDataRequester {
       // Update commit artifact cache with new information
       if (sourceBranch.getAssociatedArtifactId() > 0) {
          TransactionManager.cacheCommittedArtifactTransaction(BranchManager.getAssociatedArtifact(sourceBranch),
-               newTransaction);
+            newTransaction);
       }
       BranchManager.getCache().reloadCache();
 
@@ -81,8 +81,8 @@ public class HttpCommitDataRequester {
       IOseeStatement chStmt = ConnectionHandler.getStatement();
       try {
          Object[] queryData =
-               new Object[] {newTransaction.getBranchId(), newTransaction.getId(), newTransaction.getBranchId(),
-                     newTransaction.getId(), newTransaction.getBranchId(), newTransaction.getId()};
+            new Object[] {newTransaction.getBranchId(), newTransaction.getId(), newTransaction.getBranchId(),
+               newTransaction.getId(), newTransaction.getBranchId(), newTransaction.getId()};
          chStmt.runPreparedQuery(ARTIFACT_CHANGES, queryData);
          while (chStmt.next()) {
             int artId = chStmt.getInt("art_id");
@@ -97,9 +97,9 @@ public class HttpCommitDataRequester {
    private static void kickCommitEvent(Branch sourceBranch) {
       try {
          OseeEventManager.kickBranchEvent(HttpCommitDataRequester.class, new BranchEvent(BranchEventType.Committed,
-               sourceBranch.getGuid()), sourceBranch.getId());
+            sourceBranch.getGuid()), sourceBranch.getId());
       } catch (OseeCoreException ex) {
-         OseeLog.log(Activator.class, OseeLevel.SEVERE, ex);
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
    }
 }